Rev'ing BP commit
I'm not sure how this slipped through the cracks for so long, but it did -- Oy...
Merge branch 'staging' into wpa