Revert "solving commit problems"

This reverts commit c8b8ef040a836baff0178ec2c604c498fd922697, reversing
changes made to 99810a20416e7c5fd0398142e562f5800ae58e75.