Not needed since #3115.