Update comment regarding when the workaround for compatiblity will be needed until