Revert "Fix for issue #2421"

This reverts commit 3de264eb5d567bd191a1fe3663341bb705c8546b.