Can you note the bug number here? It makes it much easier to know when the workaround can be undone.