(Port commit done with my src/ committer hat on) Requested by: Erwin "Annoying Reminder Guy III" Lansing