Reversing Changes

This reverts commit 0bee7c9f4845922fa1d6eaef9a134844fcee5428, reversing
changes made to f8d4dd1ce286faf0f6e40e15266822bb38cb7be0.