Polish code for r189579.