Apply one more workaround for facebook/hhvm#2485