Re-enable scala layer