Switched over to restrictive behavior by default