Avoid everything that can be built and commit

Copied from Wonder actually...