Revert "Looking for fail in double saving fix"

This reverts commit 64dad1a869d9991445baff526db88224e857a68d.
Revert "Trying fix for double saving"

This reverts commit 95156784aec31af28e338f381f6ee71e47494008.
Trying new fix for double saving