Comment 7 for bug 938315

@Bhuvan: care to revive your proposed patch ?