Revert 0d45a42..85d6d3a

This rolls back to commit 0d45a4201fcbdf5c6f25b748f8d1b334fe3e4caa.