Restore rendering order water areas

This resolves #943.