Ditch the rebuild & go straight into a 3L.



Must be that jumbly-wumbly thing happening again.