See #2220 - with #2220 fixed, we don't need this method.