Crm 7964

@eileen, removed one more, with a different pattern than your global patch to come.