Revert "made changes to allow all layers to be exported"

This reverts commit c3d626cd4783d595a013209e96006e7f7cf91a7f.
Revert "Commented out return"

This reverts commit 68034fcb888c5187806fd091148e718cd5b74834.