Don't use deprecated module function

Since module was deprecated in 5.2 and not available in some installations, use 'explicitly return' approach.