[#1846] [#2265] Reverted changes for 3.1