Reverting to Blueprints 2.3.0

Blueprints 2.4.0 migration will continue in a branch off the master