Revert 9852642..a0d6fce

This rolls back to commit 985264264a02e5cec205a6f30e4c87ba5d60fbaa.