Revert "PB+SWMH changes reverted"

This reverts commit ccacd3521dd067eb5fe7f308bf3eeb155eb4902f.