Revert 0db70f0..efbfa7b

This rolls back to commit 0db70f072bb135f74dd25be95eae7c3d2bd25e99.