Update to 2.5.2. Remove USE_REINPLACE while we are here.
State Changed From-To: open->closed Committed, thanks.