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

This reverts commit 2959e690996760390f9783237a6d7baabb0bd7ff.