Revert to d35e48020e1fa7242c4ae108d461fcfae1bb1456