Back out changeset a0193d83c208 since I didn't want to test any examples