Backout 8cb2b26befbf and 25a5c009380c.