Reverting #1951, close #1958