Revert 94f90d5..d6b87f6

This rolls back to commit 94f90d52d3ac0d3bc155b8dccc8f04fd53626b48.