Handle disabled removeQueryParamOnRedirect after #598, fix build