WV-1034 Backing out layer list changes