Revert "[BUGFIX] Inaccessible pages on shortcuts/PageNotFound handler"

This reverts commit 9ab3b9b5dd96ae0f955277a8997abb4bd69a66ff.