Revert 893193e..2e9f367

This rolls back to commit 893193e79422916f522cdd7440b999f3962c2566.