Fixes #500, make sure layer overrides are pristine
snapshot