Revert 3986bff for now