Revert back to using @entry to make outpost spec happy