Revert to 5b51b5303e591a873d6ab8f4e65f8b7bec989fc1 (Changed PMI attribute name)