This won't work on Enterprise.  I'll work on a PR for your PR.