As per vote in #1995
As per vote in #1995