Revert "Merging"

This reverts commit 0ef2cad055e0b2f3eaee3b84dd0e44c4190f1db3, reversing
changes made to a23f0bb00dab5c25ec4d55a186be283a3dd63dd8.