Revert c644e7a..5493c8b

This rolls back to commit c644e7a8cef2bc767afcda3ce3f2bf2dd612e0db.