Revert 782ecc2..29d1abb

This rolls back to commit 782ecc22a26f50fd155713cc2283e63701c0fab1.