Revert 939ac93..e77a410

This rolls back to commit 939ac93bc68967ea26b64769470b099a69794012.