Revert 79e2025..6d25fa5

This rolls back to commit 79e2025ba865d8ddda959848238ee04d60638e7b.
remove ST page when not required