Revert c5ae2cf..7a84597

This rolls back to commit c5ae2cf71b960bf843bfb414b3b8ff3b438971e1.