Revert parts of 6c0f2e3d6b25fe5c87aa51f1ed967c5fd290c808