PB+SWMH changes reverted

Won't make it into this version; permission pending.