This reverts commit d22f7c9edd, reversing changes made to 1f8e6f0952.
d22f7c9edd
1f8e6f0952
Part of #1507