Revert "Corrected DrawLayers, fixed most Tank tests"

This reverts commit 25f5f7fdf53bcb069e51149eecd4797ee2c8df3c.