Revert and replace 31d95ac, 65acc7c, 87780a5