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