Revert "Changes to the Sun Module"

This reverts commit 7aa0228f1d46eef5e8debd297409b423b1cc273e.