Revert f8e9e54..da742b3

This rolls back to commit f8e9e5454da720cf8a673f98d84508ffa2c93ee0.