Log Message: Finish incomplete buildlink1 -> buildlink2 conversion accidentally committed with the last set of changes.