Revert "Bug 4450 Use more consistent error returns in C4/Creators/*"