Revert ce6d82f..eb7a7da

This rolls back to commit ce6d82f269564740d667fd1c96abcdd1bd117fe3.