Revert the accidental revert in 4c862c42b