revert c1c9c8d, still use entry_points