Enabling by default again