Reverting the revert :/ (I need to learn how to use git properly)