Restoring a few Drumlore-specific changes