Revert 7d9bb30..7cc082f

This rolls back to commit 7d9bb303efcbc7da774b124c20ec4d9260adf34e.