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