Revert 776d5ef..fa3b2d2

This rolls back to commit 776d5eff3bf645211995c52ddced0180c6974d13.
fixed merge conflicts finally