Revert "Bad commit undo"

This reverts commit 8a69e7db70cfd8fc681050d03fa1626ee6056739.