Rollback breakage to 81567e515707891837f52bc3aac7d5916dfff5a2