Reverting changes from my previous pull request