With the binding change above, these changes are not needed