Revert 1635b21..4b1e378

This rolls back to commit 1635b2196077418ef1854a09f777e21b8ad688dc.