Revert commit 7b25544de81105215c442bcedaa045b92a351f98