Remove the need to override these in our own UI