Reverted commits 776e07c..e8155c6 and moved to branch.