Restore ancient behaviour