Revert b4cb5ec..731f838

This rolls back to commit b4cb5ec03df6b5f28aa34755b58ce880f1a7ae16.
Merge branch 'Rosbel'