Perhaps it'd be better to have a config flag that enables or disables this?