This reverts commit 6324febf04, reversing changes made to fed9880872.
6324febf04
fed9880872
Update from official release