This reverts commit accea1555159d0928a6aa2db740c042c7e8f0dd3, reversing changes made to b925353006.
b925353006