Revert "Revert "Revert "Lights changes from ronasimi and paulicat"""

This reverts commit 7656fdb9c01f6c9f3fca4f74ebc849ec901462cc.