Reworking for PA Compat.