Backout 39fcd286ce68 for web platform test failure
Backout 471009c10ae0 for web platform test failure on CLOSED TREE