Reinstantiated after merging of #197.