Revert fix for #508 (close #516) [deploy snapshot]