Removed cross-compiling workarounds; manual dependency regeneration now works too