Maybe we are using the wrong builddir copy after all?