Revert 19fb1e3d44363a8d25c7ebab8faa051d1ae26767, f8d592897234b0d2a735eca04b20ccbe44f694e2, 40b19a557573a5f6faa80395b6e4b8ea2569b4f3