Currently blocked by #354
Currently blocked by #354