I've attached a patch that should prevent this kind of mistake in the
future.

We should queue it up to be pushed with the next kernel updates (on the
kernel-updates branch).