This reverts commits: b038967ee9a08f106d5b41767dc34ad68dd1a6d3, 92b3a47fdc6fa7407224ea4870d4c560f9d968eb and 5f7adf9db7b28d34bc00228c3a32d9a4db866281.