Revert 7e7e99e..2e62f46

This rolls back to commit 7e7e99e49517ce766e99638c9157d76e2b6a9340.