Backed out the old pitch workaround.