Reverse minor changes from the last commit