Revert "Merge pull request #26125 from nullaus/bug1077595"

This reverts commit a2d1cbfa62f3880c15c84215bdc5fdad4e537486.
bug 1077595 -- With fixed unit test. a=testonly
Merge pull request #26423 from nullaus/v2.0

bug 1077595 -- With fixed unit test. a=testonly