Revert ac97ac9..ea5eff7

This rolls back to commit ac97ac9ca448e78cbb3c0089821c252b9328b718.