Remove backward compatibility. It's in core now