Revert 7f997df..50243cc

This rolls back to commit 7f997df7167b9f0ae6f18e7caf9e1ff7e94d6f02.