revert 1.8 changes 389c7eb