diff --git a/Annex/SpecialRemote/Config.hs b/Annex/SpecialRemote/Config.hs
index d5677f2ab6..022f9ebf92 100644
--- a/Annex/SpecialRemote/Config.hs
+++ b/Annex/SpecialRemote/Config.hs
@@ -91,4 +91,4 @@ addSameasInherited m c = case toUUID <$> M.lookup sameasUUIDField c of
 removeSameasInherited :: RemoteConfig -> RemoteConfig
 removeSameasInherited c = case M.lookup sameasUUIDField c of
 	Nothing -> c
-	Just _ -> M.restrictKeys c sameasInherits
+	Just _ -> M.withoutKeys c sameasInherits
diff --git a/doc/git-annex-initremote.mdwn b/doc/git-annex-initremote.mdwn
index c9a0a7e79c..8340827f6d 100644
--- a/doc/git-annex-initremote.mdwn
+++ b/doc/git-annex-initremote.mdwn
@@ -57,6 +57,11 @@ want to use `git annex renameremote`.
   of the existing remote, so you should not specify any encryption
   parameters. No other configuration is inherited from the existing remote.
 
+  This will only work if both remotes use the underlying storage in
+  compatible ways. See this page for information about known
+  compatabilities.
+  <http://git-annex.branchable.com/tips/multiple_remotes_accessing_the_same_data_store/>
+
 # COMMON CONFIGURATION PARAMETERS
 
 * `encryption`
diff --git a/doc/todo/support_multiple_special_remotes_with_same_uuid.mdwn b/doc/todo/support_multiple_special_remotes_with_same_uuid.mdwn
index 15283c3ece..e509f9a29e 100644
--- a/doc/todo/support_multiple_special_remotes_with_same_uuid.mdwn
+++ b/doc/todo/support_multiple_special_remotes_with_same_uuid.mdwn
@@ -34,6 +34,9 @@ the remote.log. Eg, "B sameas=A foo=bar ..."
 
 Implementation notes:
 
+initremote --sameas ends up with the annex-uuid and the annex-config-uuid
+configured backwards. Oops.
+
 Need to get enableremote working for sameas.
 
 Deal with the per-remote state issue.