Issue #1874664 by Wim Leers, jessebeach, Gábor Hojtsy, David_Rothstein, effulgentsia: partial rollback.