Removing BC introduced in ff6738a02868deb0cd402ee2dcd9b5ddaa016564