These experimental changes in this function should be reverted.