Second fix for bug 453287 

We'll need a cleaner solution in the future

Change-Id: Id0e197501ee91b51ed16f9833908df96945d5be4
3 files changed