Revert 882e693..97ab146

This rolls back to commit 882e6939b2ec46dfec7dd0faaaed16b83103913d.