Revert 10aa987..944dc20

This rolls back to commit 10aa9874e23de0c842e4c94be7efd6b18873423b.