Revert r37281 "Split Compatibility functions to own file"