Revert [#1937]