Bug #3357 - Revert #3305 which broke old projects