As decided for CTC at the JVET T meeting
This will create a new commit in order to revert the existing changes.