Revert 5e6ec65..400a111

This rolls back to commit 5e6ec650d0556c86d9e403e4257b3aa494cc6bda.