I think it's ok to cut out stuff we're not using and vary from backports... It's not intended to be exposed to developers after all...