Revert topic 'osx-bundle-updates'

It fails tests on Linux and Windows and will need revising.
Merge topic 'osx-bundle-updates' into next

a6135454 Revert topic 'osx-bundle-updates'