Revert "fixing head"

This reverts commit d9eafe094813b978b8b0bf1ee84db3f757feee35.
Revert "Merge branch 'master' into fav_sharedpref_steph"

This reverts commit ed36fe48ccc691c445519ea9e35a51c18581e1b0, reversing
changes made to b94d9ae13a488e3cd86ed4afbbb011313ec1afb3.