Rebuild, refs #167