Backout 5ca3e253f2ef and 38dabcc9dac3.