Revert 47e0325..e75f6eb

This rolls back to commit 47e0325d6b7595be901800068ee6d96ec1933d29.