autobuild: revert a bit more of the subunit changes