Refs #135: rollback