diff --git a/lib/remote_storage/riak.rb b/lib/remote_storage/riak.rb
index 4f18267..1ae9300 100644
--- a/lib/remote_storage/riak.rb
+++ b/lib/remote_storage/riak.rb
@@ -144,7 +144,7 @@ module RemoteStorage
       timestamp = (Time.now.to_f * 1000).to_i
       delete_or_update_directory_objects(user, directory, timestamp)
 
-      server.halt riak_response[:code]
+      server.halt 200
     rescue ::Riak::HTTPFailedRequest
       server.halt 404
     end
diff --git a/spec/directories_spec.rb b/spec/directories_spec.rb
index e04eb9a..f563b49 100644
--- a/spec/directories_spec.rb
+++ b/spec/directories_spec.rb
@@ -486,7 +486,7 @@ describe "Directories" do
       it "deletes the directory objects for all empty parent directories" do
         delete "/jimmy/tasks/home/trash"
 
-        last_response.status.must_equal 204
+        last_response.status.must_equal 200
 
         lambda {
           directory_bucket.get("jimmy:tasks/home")
diff --git a/spec/permissions_spec.rb b/spec/permissions_spec.rb
index 9348dae..f8bc2e4 100644
--- a/spec/permissions_spec.rb
+++ b/spec/permissions_spec.rb
@@ -186,7 +186,7 @@ describe "Permissions" do
       it "removes the key from a top-level directory" do
         delete "/jimmy/tasks/1"
 
-        last_response.status.must_equal 204
+        last_response.status.must_equal 200
         lambda {
           data_bucket.get("jimmy:tasks:1")
         }.must_raise Riak::HTTPFailedRequest
@@ -195,7 +195,7 @@ describe "Permissions" do
       it "removes the key from a top-level directory" do
         delete "/jimmy/tasks/home/1"
 
-        last_response.status.must_equal 204
+        last_response.status.must_equal 200
         lambda {
           data_bucket.get("jimmy:tasks/home:1")
         }.must_raise Riak::HTTPFailedRequest
@@ -212,7 +212,7 @@ describe "Permissions" do
         it "removes the key" do
           delete "/jimmy/public/tasks/open"
 
-          last_response.status.must_equal 204
+          last_response.status.must_equal 200
           lambda {
             data_bucket.get("jimmy:public/tasks:open")
           }.must_raise Riak::HTTPFailedRequest
@@ -296,7 +296,7 @@ describe "Permissions" do
       it "allows DELETE requests" do
         delete "/jimmy/documents/very/interesting/text"
 
-        last_response.status.must_equal 204
+        last_response.status.must_equal 200
         lambda {
           data_bucket.get("jimmy:documents/very/interesting:text")
         }.must_raise Riak::HTTPFailedRequest
@@ -327,7 +327,7 @@ describe "Permissions" do
         it "allows DELETE requests" do
           delete "/jimmy/root"
 
-          last_response.status.must_equal 204
+          last_response.status.must_equal 200
           lambda {
             data_bucket.get("jimmy::root")
           }.must_raise Riak::HTTPFailedRequest
@@ -358,7 +358,7 @@ describe "Permissions" do
         it "allows DELETE requests" do
           delete "/jimmy/public/tasks/hello"
 
-          last_response.status.must_equal 204
+          last_response.status.must_equal 200
           lambda {
             data_bucket.get("jimmy:public/tasks:hello")
           }.must_raise Riak::HTTPFailedRequest
diff --git a/spec/riak_spec.rb b/spec/riak_spec.rb
index eb6e42f..3ac50a1 100644
--- a/spec/riak_spec.rb
+++ b/spec/riak_spec.rb
@@ -524,7 +524,7 @@ describe "App with Riak backend" do
         end
 
         it "removes the key" do
-          last_response.status.must_equal 204
+          last_response.status.must_equal 200
           lambda {
             data_bucket.get("jimmy:documents:foo")
           }.must_raise Riak::HTTPFailedRequest
@@ -564,7 +564,7 @@ describe "App with Riak backend" do
           header "If-Match", old_etag
 
           delete "/jimmy/documents/foo"
-          last_response.status.must_equal 204
+          last_response.status.must_equal 200
 
           get "/jimmy/documents/foo"
           last_response.status.must_equal 404
@@ -593,14 +593,14 @@ describe "App with Riak backend" do
         end
 
         it "removes the main object" do
-          last_response.status.must_equal 204
+          last_response.status.must_equal 200
           lambda {
             data_bucket.get("jimmy:documents:jaypeg")
           }.must_raise Riak::HTTPFailedRequest
         end
 
         it "removes the binary object" do
-          last_response.status.must_equal 204
+          last_response.status.must_equal 200
 
           binary = cs_binary_bucket.files.get("jimmy:documents:jaypeg")
           binary.must_be_nil