Restore d5df425c after js-sweep merge.
Restore a60e3668 after js-sweep merge.