Revert 65c8e5a..e3484cd

This rolls back to commit 65c8e5a9d3a9f4b995341799a3a7319a12b21e62.