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