I had actually assumed this would be fixed by @justinmk's #782. Should I do it now?