Recommitted changes to fix commit history