Revert "Quick hack, to make AMR with Samsung Handsets"

This reverts commit b6ad978d093f31e74f268e15cedf431cd6e5c598.