Revert "Lights changes from ronasimi and paulicat"

This reverts commit 607ead285757e3ae62175d73c7a69759c018741e.