Reverting _compat code