Reverts c723d8dd546412b08ffaf3846b5574f4f4021418