Revert "Fix for issue #107"

This reverts commit 4d28b606f2db5d2b163135f145c45376f7054ea6.
Updated fix for  issue #107
Portal integration fix for issue #51