Fix #982 and revert workaround
Merge branch 'master' of https://github.com/google/WebFundamentals