This reverses commit 58eceac9e21a407d2a0ebffe6ff6ecf5a4f03ad3 but keeps nexus 5 source addon part from commit f04dbae2b3f7a68f360ac4c1d3b32518c11c8852