Partially revert cf5381f after discussion on #519.