Refs #74: revert some temporary changes