Fix linker issues in 10.10
Create our own layer instead of overriding type