Backout 3b3370588b03 and 6bf2fccf7550 to generate snippets for 29.0.1 build2 properly