Revert 4219aae..8c0ae6a

This rolls back to commit 4219aae64abe770abbe0e1e704019bd2677b3549.