Reverted to working activity_entry