Revert "Revert "Revert 04457d8..e246c52""

This reverts commit d7ec5235ab0f626efe382c990943cefcf0d295f6.