Revert acd8d37..5d6b719

This rolls back to commit acd8d379e5bd4b566fd2b203a448175e5a27db75.