Rollback some backports from 3.14 but keep those from 3.13.11

In hopes that we won't kernel panic anymore