Revert 6a53081..ac27159

This rolls back to commit 6a530810aa0a5ba984ab2fa3fffd2b0b7938e742.