rolling back some directives changes to find the source of the issues