This reverts commit 006c7975. We've committed a better fix, and we shouldn't encourage folks to copy paste this workaround. bug: 19012244