This reverts commit ecdb8184, reversing changes made to 8c3766e5.
Need to follow SDK version and difference with this wonderful too called GIT!!!!