Revert "Fixed conflicts?"

This reverts commit 5543c5ab25162dd16c2d55eaf297152583cbe7f1, reversing
changes made to 42623a4119cf3428bcb5dfd782b2c483471ec94f.