Temporarily revert the last change, which breaks PPC and other targets that