Backout 38b25d5e6cf9 because assertions