A bit more un-branding..

This should have made it to the prev commit.