instead of hardcoding backwards compatiblity. This way we get deprecation warnings and also builders will work.