This should have gone in in the previous commit