backout 4853: breaks lint