tweaks for rebuilding pre3004