Bug 1084092 - Clean up some of the changes from bug 1013989. r=MattN

--HG--
extra : rebase_source : 01fdf0e5cc10fc03c3af2aa4318c0564cbf7b9b6