Revert ac21e38..4fa919f

This rolls back to commit ac21e38fbf1bd72e850237bc2f830fd0607a12b2.