Logging here so I don't forget to undo #168.
Logging here so I don't forget to undo #168.