One more item that needed to be removed for extension compatibility