Revert "Commit cleanup"

This reverts commit 58db81a72e1abb87e123c09106fc552bfa14bd8e.