Revert 350f492..77e77d0

This rolls back to commit 350f492eb7206aaf9dc6981e47ab0f1be4b95bbe.