Make the code to force a rebuild even more aggressive