Just noting here that we should make this commented-out part happen in the near future.
Commit and comment here