Fixes issues with domless builds

Some of the previous domless checks were removed some-how which was
breaking the builds with steal-tools. This just adds those checks back
in.

We should create a test that checks that builds will work.
Merge branch 'domless-fixes' into sams-temp