Fixes: #192 (closed)
Conflicts with !912 (closed) which can be taken if this doesn't make it.
Cc: @demarle @cory.quammen @utkarsh.ayachit