Revert 3475f30..aaae093

This rolls back to commit 3475f3053d12eee67f90bf1cf6848614c3e994ba.