Comment 9 for bug 632884

The patch to resolve this bug has been reverted as it's causes regressions. See bug 641320. Please submit a revised patch for Maverick SRU. Thanks.