In that case I would leave it as is, if it will prohibit other functionality, we should wait until things are ready before returning