One more reversion for #27.