Revert "Conflicts:"

This reverts commit 2b2af11066ad3d1da899bc7c4b51d8c60b7794bc, reversing
changes made to 89f9495cfa004104697d8b3c1df6e330586d3d2c.