Revert b68e0b2..5c17153

This rolls back to commit b68e0b231ef3e2e298c272190715ad5a4b1d4dc4.