Revert to d8c965a0ec8ed58655e7b2671baf1fc127f31f53