Fix incorrect attempt to revert fix for RT11913.
Merge pull request #161 from khogenso/devel

Fix incorrect attempt to revert fix for RT11913.