Revert 7e673af..3643fa4

This rolls back to commit 7e673af401357ab3a8fa75d3d082b919b4e0c759.