Revert 5a31a26..4fd92a2

This rolls back to commit 5a31a26471a2e3d6a2f695e058723fc3f95ed220.