We should eventually make this enabled with a flag or something.