Done. See cbf7f91cfb435e9b4d39d87c4979ea1af732962f in #945.