Revert "oneandonlycommit"

This reverts commit e0b3747aefd95d0befafaa84fd3dabab4af2f3d7.