Is this being used by this PR? I don't think it's necessary in the framework, anyways.