Revert 932a245..df08ce6

This rolls back to commit 932a2451a50a387fab8e16357633f78992c462db.