Reimplement 121edb7