Revert "KFSPTS-3659 Add code change after code review"

This reverts commit 7688a43fd13e58ebcc2cc21b5bba6c4316d172e2.
Revert "Revert "revert f6e7ce94bf010ab1a97a5511e6c8cb5afc05aa8e, testing was not done in time so thie issue was pulled from the patch""

This reverts commit 151e6547f6b28b3e924e86dd1162b8e18bd8308d.