Revert "Remove clone fix and use different keys instead."

This reverts commit a899bd137b0317a7a640b5a70a65a987c6896f40.