Revert ac5841d..3606848

This rolls back to commit ac5841d3a3d9adda5ccbdd2677b8eb7a2a3afaa0.