Revert "Make Lon's file even better"

This reverts commit f818c0b08304b1c10e38f0e33dd5de1b82ad5118.
Revert "Revert "Make Lon's file even better""

This reverts commit e6aafd329236855695bba1872c4974639460ae85.