Comment 9 for bug 1648055

@Seth, I just tested your patch and it seems to work well. Did you get a chance to address @Jeff's concerns about doubling the clearance? Once you address that, I'm fine with merging this patch as part of 5.1.