Fix merge failure for Linux 3.4.87