Don't call parent::access_feature() to get the access as we have our own logic.

#3351 

re-roll with branch at correct HEAD