This reverts commit fe7fd331263007e0fb2877ef7370a09a9704da36, reversing changes made to 4fabf83ad0.
4fabf83ad0
This reverts merge request !1653