Revert to b8171feafd7671fcdb800f433c0ffecdf7db9040