Reverting branch to v1.0.1 and adding switch after repo sync