fix for bug 7913
[[ Bug 7913 ]] Removed commented out old code.
Merge branch 'bugfix-7913' into develop