Code needed to be copied over from the Standard jar due to an ugly cyclic dependency
3 files changed