This resolves Bug 2452 Signed-off-by: Nick Leverton <nick@leverton.org> (cherry picked from commit 9e82e24129)
9e82e24129