Revert "Weird changes"

This reverts commit 23c0b56df165c949b9b6fdf272f2e2cde8fabc02, reversing
changes made to a8f019428d55c4f6c413408114c914fb3cc01172.