See linked JIRA. Please backport this to the product.
*** This bug has been marked as a duplicate of bug 1179738 ***