Revert 37815ed..76f7980

This rolls back to commit 37815edf1422ed171c17d53ff9756097741a1115.