We don't want this on the BB branch

Revert "This should not be merged in just yet"

This reverts commit f0b7ede9abd574cec4691a6ef0daa507b2a4bac2.