Revert "Clean up"

This reverts commit 718c6b047b25bf26e126a1d7478fef331026b152, reversing
changes made to 560dc1aae4fb772d07a5d1da94764e9adb554df7.