Reverting to the state of the project at BS12/master