Revert builder2 changes