Revert "commit before merge"

This reverts commit af146fa258e920ef81cd68d795acf1a83bdeee68.