Revert c38987e..ff43e38

This rolls back to commit c38987eec1dbed9441432198cf1a25b9b3744902.