This reverts commit cde5e1ad.
This reverts commit bc9f8cbc, reversing changes made to 9026ec69.
This reverts commit 99a24147.