This reverts commit b9c6c7cb.
It appears this caused the .o files to be deletec under some circumstances.