Backout changeset 3c485407dec4a716f9bafd8d97668f2ed2cf567f

2017-11-22, dgaberscek