Reverted back to old logic for Problem API.