Rework previous commit to avoid backwards incompatible change