Better fix for 3.12.0-35, thanks to Michael Rasmussen.