No more BC? Not sure what's going on this commit, it needs a test to be more clear.