Re-apply bugfix that somebody undid.