Re-apply BaseColor commit