Merge pull request #1726 from mozilla/issue1725

remove transitional code introduced for issue #1000

Looks good, the cleanup is good, less code is great, tests all pass, manual testing works as expected - r+

close #1725