Revert "Lamp's Merge"

This reverts commit 1d24ea8ca61716f2e2b54248a3938e30f56a94be.
Revert "More Lamp fixes"

This reverts commit c812ee79829b157a22e8c10956ab4a30fca0ce9d.