Revert d4d239382c246690406d41f5c13302f1ca323106