This reverts commit 4267b11fa17282f6eecde62c984baef1f63b21a0, reversing changes made to 1764b7e9c0a3891955b97136c2fa0d5821b8f40b.