This was refactored by Mozilla into doing effectively the same thing so it aligns with them re: behavior. Resolves #1513