bdc15d680a
This reverts commit 0e922eee369cf12979df70927dc1f684f8dc9c16. (this was pushed accidentally, and is meant to be a downstream only patch)