Revert 4776545, as it belongs in indigo-devel.

Refs #194