Revert 6d85155..172d2a0

This rolls back to commit 6d85155958d4bc18dd25a43f83737f966464b214.
Revert 1959157..a2c9572

This rolls back to commit 1959157524afe4b9ef603d31a50742bb0d4fae2e.