Easier to just override this than tweak the umbrella.
API change, slight cleanup.