Partially revert 41c13871e712d669ff981a4d67b40438aecf596c and typo