Revert 296c501..5668710

This rolls back to commit 296c5012a95732efddf47dbbceab1a7741ce12a0.
Revert 2459ce1..95e56c5

This rolls back to commit 2459ce15ceee25ba3d0192a382a4eeb81f325f2d.