1. revert changeset that reverted changes that weren't vandleism

    Closed
    #141321569 4877 2