The reason for this change is that RPi2 and RPi3 are compatible, and hopefully all differences coming up can be resolved without ifdefs but at runtime.