dmitriv recreated in a separate PR and merged that. The linked revert PR by a user was closed.