Still tracking the `v1.0.1` tag for now, just reverting all the unnecessary style changes that created a diff with upstream. (cherry picked from commit 6c78170d8c)
6c78170d8c