AFAIK with the build-script upgrades we have done - this monkeypatch is
no longer necessary. The build size still seems to be the same.