It is safe to do it now... at least add a #TODO so that pylint yells at us?