Revert "Revert "Fix out of tree builds""