This works around regressions added in the 4.7 kernel.

Signed-off-by: Ben Greear <greearb@candelatech.com>