Revert 4340f82..9cdae71

This rolls back to commit 4340f82b1d24a798e4c9a4231c4cc6dd7c626307.