Reverted parts of my last commit