I believe this was taken care of in #5221, so it can be removed.