Revert annotation simple names fix.