Revert "Portal integration fix for issue #51"

This reverts commit fa7609b462b25c7dc27c08a75c0dcf100963736b.