Put working code back, extend to Global Photons.
Branch mono_bug created for the bug