Revert 191c73f..541607f

This rolls back to commit 191c73f311a2e6f08757ccd140e0844ffb350322.