Fixing some of my lacking git-fu which broke my previous commit