Fixed 'Bug 14154 - "replace with return" fix creates redundant code'.