Revert fix for bug #4415 that was not in this branch

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge commit 'a4cbabc'