Revert "Committing conflict-starting change"

This reverts commit 2379538b950344d458109a32d56bc39df66c15b7.