Revert 66b6ff5..8a37c78

This rolls back to commit 66b6ff55c46b3f6fe5dce8dd34344a99f6cb9f55.