Manually applying https://github.com/eduardolundgren/dotfiles/pull/35