Revert "Sol and Luna"

This reverts commit dccdb0234653c7d7e1923860b458facd3a1189ba.