Revert 00afd34..86b800b

This rolls back to commit 00afd34869021bd0fbeb27c8d11875369e296954.