Revert 9a5ae8edd6d006c078b3af8fdfd84677a63276b1.