Trying to resolve the conflict
Revert 51585d4..ccf9a61

This rolls back to commit 51585d4ed24d841245c2dd9c01d7977e6353617e.
Revert ccf9a61..37672a9

This rolls back to commit ccf9a61be988f7416f89a42c1170e8345d72816a.
Revert 83d841b..25ab106

This rolls back to commit 83d841be2b8b62c01afc6ec313789b5b981ebee4.