Respect rebuild option

I found that the rebuild option did not do anything. This is just to actually use it.
I thought it'd be good to preserve existing behaviour. I'd imagine not many people specified this option before since no one noticed it not being used.