Revert "Merge branch 'master' of https://github.com/faemir/summit.git into controls-class-REF#16"

This reverts commit 7eeb26393455db0bf2a050b7cd239bcd08de32f4, reversing
changes made to 44a3de7c9c9746bd0c83f9a08b5ba5d770f95b95.