Partially revert 2115f0f