Revert f9b1429..e4a710d

This rolls back to commit f9b1429cda3f93f4199c8a35f54cfe3084794d1c.