Revert multiple files back to core 1.8 implementation