Revert "fixes"

This reverts commit bf0fb91294119d6662f4fc1f47ef1ae4a728c8f4.
Revert "Merge in I9505G sources"

This reverts commit fe518ff0272e5ba3e70618d9ea486fa316e6b6fc.