Revert Patch D18462
Patch for review D18462 snuck into commit cf5346cb2233. This reverts the patch to restore original fill color window behavior.