Revert "GTNPORTAL-2929"

This reverts commit 18bbb85ecf070ef9462f6e8593e84230ca25440f.