Reverting Rui's changes in non-intrusive way
Merge branch 'master' of https://github.com/abhinigam/norbert into abhinigam-master