Removing Nexus 5 special case code, #191