Revert cbdfc9a..76fb069

This rolls back to commit cbdfc9a185b12366488587fffaf0af4b6a934c3c.