Revert "Surface's internal color is only used with accelerated surface"

This reverts commit 23eff970c5a19e897f8f8a97c70c4bb7b88a64fb.