Currently blocked by #356
Currently blocked by #356