This reverts commit 38ad9f47
Some XPS development is being done (in order to add a 2nd I2C bus), and to prevent any sort of merge conflicts, we are reverting this commit to a later time.
