Back to riding the lighting for the master branch