Bug 33227: Remove invalid spec and adjust the code accordingly