Slowly moving towards 1.12 support