Patched hole in ifndef statement for layer 1. See full commit report for more.