Revert "Merge branch 'gls_portal'"

This reverts commit 37ae9aed9a8d3e626c173c0100256d858299e6cd, reversing
changes made to 1ed82a24ce802a17e68027151344663a6cbeae87.
Revert 222bf04..95beb16

This rolls back to commit 222bf0483cd7ad1c26d13242f1264cb90c55caed.