Revert 238282f..9b4560a

This rolls back to commit 238282f4fc3c49096d157f916d14642da5c8ebbc.