Revert "Merge in I9505G sources"

This reverts commit 61007242f3e083a6b2fe7721aa85361861fba728.