This reverts commit fc25c9fba0, reversing changes made to 41ae5d8981.
fc25c9fba0
41ae5d8981
a0036d10fc