Revert f87d664..43a96a5

This rolls back to commit f87d664627ce5fab8ff02e966baa589ffdd086d1.