Revert 9ca47c6..1ac0cda

This rolls back to commit 9ca47c61c46ea9241fd4bf437cdaef9f72a168e9.