Revert 165b779..d0d5726

This rolls back to commit 165b77935ce40bdd429724c9c9225d987650463e.