Revert ebead2d..dd7b502

This rolls back to commit ebead2d607faef397bcd42812555e32c1758ddba.
Revert 3857795..643d945

This rolls back to commit 385779597eb325f36489d149fe21887f8c98e8f5.