Reverting to the state of the project at 17d43cd