Merge "Hard deprecate codepaths where tidy is disabled"