Rebuild, refs #168