Fully restore b8419fd back.