Revert "Make it work with a single build!"

This didn't actually work. I forgot to delete the
'scratch' created from a previous build... ;-)

This reverts commit a1a488a6254c30fec81726133bf446cdf8d6ab72.