RF-13179: reverting workaround that leverages @WebServlet