Revert 8cdd4a2..4f54a37

This rolls back to commit 8cdd4a22dbba426f591ca512379ba3fa0b6298e1.