This reverts commit 30ec6bea98e26f43018d2b17e84feeef2674673b, reversing changes made to 69fc08668cae8ffd195b8c5dd80b71c8c94606aa.