Revert Merge 9473

I only intended to publish, not checkbuild. This branch is not yet ready
for develop.

This reverts commit 9af289b7d65a1fcd0db4fbf4fe22523ba14288ca.