Fire from lenses on sunny days v2.5

ok, not knowing git very well proved a major inconvenience for making this.
still, every day we learn something new.... and i learned of git revert today.

this is the remake of #9526 with the #9577 fix added.

hope it works... 
it should, but i am also currently compiling to make a sanity check
Just out of curiosity, but why was this function moved?