Revert 4e6fa4b..e92be58

This rolls back to commit 4e6fa4b9dd91417fab9ed14fbb8fe9a63b938046.