Temp commit to fix breakage from #289.

Will be removed after rebasing on top of #291.