Fixes #1840 (#1880)
Fixes #1840 (#1880)

cc @cristianoc
let-def/reason,let-def/reason,cristianoc/reason,facebook/reason,cristianoc/reason,chenglou/reason,chenglou/reason,cristianoc/reason,facebook/reason,facebook/reason,let-def/reason,chenglou/reason