Revert "Branch for Shiftboard integration."

This reverts commit a96db9cf68dad8be86c1718a65e8c872dc9499d8.